Merge
authortdeegan@york.uk.xensource.com <tdeegan@york.uk.xensource.com>
Thu, 17 Aug 2006 15:26:34 +0000 (16:26 +0100)
committertdeegan@york.uk.xensource.com <tdeegan@york.uk.xensource.com>
Thu, 17 Aug 2006 15:26:34 +0000 (16:26 +0100)

Trivial merge